Combines modifiers not allowed with type, and combinations.This also simplifies logic. Adds more detail to explanation #2807
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dottybot
reviewed
Jun 24, 2017
johnregan
changed the title
felixmulder
suggested changes
Jun 26, 2017
| } | ||
| } | ||
|
|
||
| private def getPrintableTypeFromFlagSet(flag: FlagSet) = | ||
| Map(Trait -> "trait", Method -> "method", Mutable -> "variable").get(flag) | ||
|
|
There was a problem hiding this comment.
Since this method is only used by addFlag, I would nest it in the method like:
def addFlag(mods: Modifiers, flag: FlagSet): Modifiers = {
def getPrintableTypeFromFlagSet(flag: FlagSet) =
Map(Trait -> "trait", Method -> "method", Mutable -> "variable").get(flag)
if (compatible(mods.flags, flag)) mods | flag
else {
syntaxError(ModifiersNotAllowed(mods.flags, getPrintableTypeFromFlagSet(flag)))
Modifiers(flag)
}
}| | `lazy' values | ||
| | AccessModifier ::= (`private' | `protected') [AccessQualifier] methods, classes | ||
| | AccessQualifier ::= `[' (id | `this') `]' | ||
| | |
There was a problem hiding this comment.
Having a copy of the syntax here might be nice, but it'd be better if we could link to the spec (we could open an issue for this instead).
There was a problem hiding this comment.
That makes sense rather than duplicating maintenance effort
felixmulder
approved these changes
Jun 27, 2017
|
@felixmulder can someone press merge 😄 |
|
Of course, thanks! 🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.